From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 9 Jun 2008 08:51:14 +0000 (+0100)
Subject: x86: Fix S3 resume after creating an HVM guest.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14200^2~77
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=3e28b1c5bb5dab099a18143a40b45ebf59a34d45;p=xen.git

x86: Fix S3 resume after creating an HVM guest.

If we don't use PIT, we should disable it at boot time and at S3
resuming. In Xen this is done by disable_pit_irq(), but this function
is used by __initcall(). After bootstrap it will be discarded and may be
overwritten. This usually results in S3 resuming failure.

Signed-off-by: Huacai Chen <huacai.chen@intel.com>
Signed-off-by: Li Zhang <li.zhang@intel.com>
---

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 8a195c6fff..2a3c85b05e 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -999,7 +999,7 @@ void __init early_time_init(void)
     setup_irq(0, &irq0);
 }
 
-static int __init disable_pit_irq(void)
+static int disable_pit_irq(void)
 {
     if ( !using_pit && cpu_has_apic )
     {